From 462f86d301c898830b3744e8b4b12cca8369ed56 Mon Sep 17 00:00:00 2001 From: Nikita Churaev Date: Wed, 18 Jun 2014 20:09:43 +0400 Subject: [PATCH] New window shadows https://bugzilla.gnome.org/show_bug.cgi?id=731866 --- gtk/resources/theme/Adwaita/_common.scss | 12 +++++++----- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 +++--- gtk/resources/theme/Adwaita/gtk-contained.css | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index ed705086dd..03f09b862a 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1874,16 +1874,18 @@ GtkColorChooserWidget #add-color-button { // this needs to be transparent // see bug #722563 - $_wm_border: if($variant=='light', transparentize(black, 0.8), transparentize(black, 0.4)); - box-shadow: 0 2px 10px 4px transparentize(black, 0.9), + $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1)); + $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color, 0.1)); + + box-shadow: 0 3px 9px 1px transparentize(black, 0.5), 0 0 0 1px $_wm_border; //doing borders with box-shadow /* this is used for the resize cursor area */ margin: 10px; &:backdrop { - box-shadow: 0 3px 6px 2px transparentize(black, 0.9), - 0 0 0 1px transparentize(black,0.7); + box-shadow: 0 2px 6px 2px transparentize(black, 0.8), + 0 0 0 1px $_wm_border_backdrop; } &.tiled { border-radius: 0; @@ -1891,7 +1893,7 @@ GtkColorChooserWidget #add-color-button { &.csd { &.popup { border-radius: 0; - box-shadow: 0 1px 2px transparentize(black, 0.6), + box-shadow: 0 1px 2px transparentize(black, 0.8), 0 0 0 1px transparentize($_wm_border,0.1); } &.tooltip { diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 7ceca51add..6af33ccf90 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -2478,16 +2478,16 @@ GtkColorChooserWidget #add-color-button { .window-frame { border-radius: 7px 7px 0 0; border-width: 0px; - box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.6); + box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(28, 31, 31, 0.9); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.3); } + box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup { border-radius: 0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.5); } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); } .window-frame.csd.tooltip { border-radius: 5px; box-shadow: none; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index c8052a8e81..c4f02dcd7c 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -2476,16 +2476,16 @@ GtkColorChooserWidget #add-color-button { .window-frame { border-radius: 7px 7px 0 0; border-width: 0px; - box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23); /* this is used for the resize cursor area */ margin: 10px; } .window-frame:backdrop { - box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.3); } + box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); } .window-frame.tiled { border-radius: 0; } .window-frame.csd.popup { border-radius: 0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.1); } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } .window-frame.csd.tooltip { border-radius: 5px; box-shadow: none; } -- 2.30.2